[automerger skipped] Merge "DO NOT MERGE" am: 1af0217323 -s ours Change-Id: I4983512bf3b6a643cbc7ec0e93c31c5b0a9a4680